Switch faraday_middleware to the upstream master
[My PR](https://github.com/lostisland/faraday_middleware/pull/102) has
been merged, so we can remove our local workaround.
Akinori MUSHA
4 changed files with 11 additions and 10 deletions
+ 1
- 1
Gemfile
@@ -67,7 +67,7 @@ gem 'devise', '~> 3.4.0' |
||
| 67 | 67 |
gem 'dotenv-rails', '~> 2.0.1' |
| 68 | 68 |
gem 'em-http-request', '~> 1.1.2' |
| 69 | 69 |
gem 'faraday', '~> 0.9.0' |
| 70 |
-gem 'faraday_middleware', '>= 0.10.0' |
|
| 70 |
+gem 'faraday_middleware', github: 'lostisland/faraday_middleware', branch: 'master' # '>= 0.10.1' |
|
| 71 | 71 |
gem 'feed-normalizer' |
| 72 | 72 |
gem 'font-awesome-sass', '~> 4.3.2' |
| 73 | 73 |
gem 'foreman', '~> 0.63.0' |
+ 9
- 3
Gemfile.lock
@@ -20,6 +20,14 @@ GIT |
||
| 20 | 20 |
rest-client (~> 1.8) |
| 21 | 21 |
|
| 22 | 22 |
GIT |
| 23 |
+ remote: git://github.com/lostisland/faraday_middleware.git |
|
| 24 |
+ revision: c5836ae55857272732b33eb0e0a98d60e995a376 |
|
| 25 |
+ branch: master |
|
| 26 |
+ specs: |
|
| 27 |
+ faraday_middleware (0.10.0) |
|
| 28 |
+ faraday (>= 0.7.4, < 0.10) |
|
| 29 |
+ |
|
| 30 |
+GIT |
|
| 23 | 31 |
remote: git://github.com/tumblr/tumblr_client.git |
| 24 | 32 |
revision: 0c59b04e49f2a8c89860613b18cf4e8f978d8dc7 |
| 25 | 33 |
branch: master |
@@ -187,8 +195,6 @@ GEM |
||
| 187 | 195 |
extlib (0.9.16) |
| 188 | 196 |
faraday (0.9.1) |
| 189 | 197 |
multipart-post (>= 1.2, < 3) |
| 190 |
- faraday_middleware (0.10.0) |
|
| 191 |
- faraday (>= 0.7.4, < 0.10) |
|
| 192 | 198 |
feed-normalizer (1.5.2) |
| 193 | 199 |
hpricot (>= 0.6) |
| 194 | 200 |
simple-rss (>= 1.1) |
@@ -553,7 +559,7 @@ DEPENDENCIES |
||
| 553 | 559 |
em-http-request (~> 1.1.2) |
| 554 | 560 |
evernote_oauth |
| 555 | 561 |
faraday (~> 0.9.0) |
| 556 |
- faraday_middleware (>= 0.10.0) |
|
| 562 |
+ faraday_middleware! |
|
| 557 | 563 |
feed-normalizer |
| 558 | 564 |
ffi (>= 1.9.4) |
| 559 | 565 |
font-awesome-sass (~> 4.3.2) |
+ 0
- 5
app/concerns/web_request_concern.rb
@@ -123,11 +123,6 @@ module WebRequestConcern |
||
| 123 | 123 |
|
| 124 | 124 |
builder.use FaradayMiddleware::Gzip |
| 125 | 125 |
|
| 126 |
- unless builder.headers.any? { |key,| /\Aaccept[-_]encoding\z/i =~ key }
|
|
| 127 |
- # Exclude `deflate` by default. See #1018. |
|
| 128 |
- builder.headers[:accept_encoding] = 'gzip,identity' |
|
| 129 |
- end |
|
| 130 |
- |
|
| 131 | 126 |
case backend = faraday_backend |
| 132 | 127 |
when :typhoeus |
| 133 | 128 |
require 'typhoeus/adapters/faraday' |
+ 1
- 1
spec/models/agents/website_agent_spec.rb
@@ -233,7 +233,7 @@ describe Agents::WebsiteAgent do |
||
| 233 | 233 |
to_return(body: 'hello', |
| 234 | 234 |
status: 200) |
| 235 | 235 |
stub_request(:any, /deflate/).with(headers: { 'Accept-Encoding' => /deflate/ }).
|
| 236 |
- to_return(body: '\xcb\x48\xcd\xc9\xc9\x07\x00\x06\x2c'.force_encoding(Encoding::ASCII_8BIT), |
|
| 236 |
+ to_return(body: "\xcb\x48\xcd\xc9\xc9\x07\x00\x06\x2c".b, |
|
| 237 | 237 |
headers: { 'Content-Encoding' => 'deflate' },
|
| 238 | 238 |
status: 200) |
| 239 | 239 |
|